Merge "Report negative proximity if we lose the prox sensor" into tm-qpr-dev am: 257efc5a

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



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