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

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

Change-Id: Ic968b220382b9b9e6bd919e55b63f92072bd3e02