[automerger skipped] Merge "Report negative proximity if we lose the prox...

[automerger skipped] Merge "Report negative proximity if we lose the prox sensor" into tm-qpr-dev am: 257efc5a am: 4af4078a -s ours am: 05e7894b -s ours

am skip reason: Merged-In I01e7c8ad2a5dc8fb9e01aa6e9622d2b4dbd812df with SHA-1 e08fd8c1 is already in history

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



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