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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893834

Change-Id: I9418208460380e74aa403f4135d0df7dfc9cb224