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

Change-Id: I8234028367ef0e8cd749f79a843e0238745b74c1