Merge "[automerger skipped] Merge "Prevent recursive calls to proximity sensor." into rvc-dev am: 92be13d838 -s ours am: 9773280b2d -s ours" into rvc-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
83ceff85e3