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