[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into...
[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into rvc-d1-dev am: 6aae8bdf am: a1764b31 am: 20300f35 -s ours
am skip reason: Change-Id I8be62222c4e2b586218696b1d8b6ac158ebeffb5 with SHA-1 ddc924af is in history
Change-Id: Ic278c9d5e1d6944109cabdaa8d8f1b2bbe290e87