[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into...
[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into rvc-dev am: 92be13d8 am: 8f06990a -s ours am: 46d0c768 -s ours
am skip reason: Change-Id I8be62222c4e2b586218696b1d8b6ac158ebeffb5 with SHA-1 dddcae9a is in history
Change-Id: I0d1f5123033b8398506e2990fada9723c0cf7105