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

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

Change-Id: Iaf7704db9e443efde35da4ceabbbdc85076d4685