Merge "Prevent NPE in ProximitySensor." into rvc-d1-dev am: a88064cf5b

Change-Id: I5ebf37c0cf9a578eb7c853ba78e8ec87e84ca4e1