Merge "Merge "Ensure that ProximityCheck runs on Main thread." into rvc-dev am: 56caddc3 am: f0376986 am: 7e304bf1" into rvc-qpr-dev-plus-aosp