[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: 9773280b -s ours am: 0c82e03e -s ours am: 9928b14e -s ours

am skip reason: Change-Id I8be62222c4e2b586218696b1d8b6ac158ebeffb5 with SHA-1 209e793a is in history

Change-Id: I30ba45a69a730985aa9f7c62f9eee70608e3bf31