Merge "Merge "Ensure that ProximityCheck runs on Main thread." into rvc-dev am: 56caddc3 am: 4cdcd9c2 am: d8f00d81" into rvc-qpr-dev-plus-aosp