Merge "RESTRICT AUTOMERGE ProximitySensor now supports dual-sensor approach." into rvc-d1-dev am: f4ebebef25
Change-Id: I651967874c39791c8ea3961adb1d02b3ea170c5c
This commit is contained in:
f4ebebef25
Change-Id: I651967874c39791c8ea3961adb1d02b3ea170c5c