Merge "Ensure that ProximityCheck runs on Main thread." into rvc-dev am: 56caddc396 am: f0376986d3 am: 7e304bf17a

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

Change-Id: I092e1778fab51230bda97bb1480e84dfee2a4d54