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

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

Change-Id: I586894b43e59710f9bb4cd809b4c115dd28264f8