Finger-STS: Combined Proximity and Tactile Sensing for Robotic Manipulation