[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: d8430ea7 -s ours
am skip reason: Change-Id I8be62222c4e2b586218696b1d8b6ac158ebeffb5 with SHA-1 209e793a is in history
Change-Id: If161d4c80e5e0d6fffd86f408495f49d928c5705