Merge "Report negative proximity if we lose the prox sensor" into udc-dev am: dcae54ef

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



Change-Id: Ida0ce5948af99aded69f2e3f73a4a4965290d829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>