Merge "[automerger skipped] Merge "Prevent recursive calls to proximity...

Merge "[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into rvc-dev am: 92be13d8 -s ours am: 9773280b -s ours" into rvc-d1-dev-plus-aosp am: 83ceff85 -s ours am: 6ff3750c -s ours

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

Change-Id: I64c02269499aad8e565901292bfc0dc6b5581a75