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

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

Change-Id: Ie3394b942f8abe9adaa5d0e338bf85aa5db262c7