tree 5abed311f1a94951ed9b1d33334d8cc74943a82f
parent 8b9473a80bc966e7f98ccfe9e28954e81bc3c5d5
parent fdc35a249135505ed7a34127dd5aedd04bcd4d21
author Santos Cordon <santoscordon@google.com> 1596793591 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596793591 +0000

Merge "Allow Power-button to temporarily ignore proximity sensor." into rvc-d1-dev am: fdc35a2491

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282513

Change-Id: I4913d33ac3e20e97ebdc524189e40f772f4dbbe3