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: 4cdcd9c2 am: d8f00d81" into rvc-qpr-dev-plus-aosp am: 2cf0fb88

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

Change-Id: I7e59c8ebadc896decef44373fe26c844d3925bc1