Merge "Merge "Ensure that ProximityCheck runs on Main thread." into rvc-dev am: 56caddc396 am: f0376986d3 am: 7e304bf17a" into rvc-qpr-dev-plus-aosp