[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into...
[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into rvc-dev am: 92be13d8 -s ours
am skip reason: Change-Id I8be62222c4e2b586218696b1d8b6ac158ebeffb5 with SHA-1 209e793a is in history
Change-Id: I9aa0127e9b22f034f9c4ee57087777a8dc43ffee