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

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

Change-Id: I7ee54f20448d6b39f1220e20b2752369cb6e7606