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

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

Change-Id: I14c8c74c5a3f234f5e75de573eb8c8eb88ab0850