[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into rvc-dev am: 92be13d838 -s ours am: 9773280b2d -s ours

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

Change-Id: I406972dcf76884b101dcb3dcf94b1369e03f747a
This commit is contained in:
TreeHugger Robot
2020-05-19 15:45:51 +00:00
committed by Automerger Merge Worker

Diff Content Not Available