Merge "Merge "More defensive checks for ProximitySensor" into rvc-d1-dev am: 8ce8c004a4" into rvc-d1-dev-plus-aosp