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

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

Change-Id: I5c9440b24473f9515d833a72ec8d43dc5d848ff7