Merge "Merge "Ensure that ProximityCheck runs on Main thread." into rvc-dev...

Merge "Merge "Ensure that ProximityCheck runs on Main thread." into rvc-dev am: 56caddc3 am: f0376986 am: 7e304bf1" into rvc-qpr-dev-plus-aosp am: 7ac2c94a

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

Change-Id: I30cf6a2225cce86af5dcba94244fae19b4c197e4