Merge "Fix screen not turning off on power button press." into udc-dev am:...

Merge "Fix screen not turning off on power button press." into udc-dev am: c601b238 am: 8b392e6a

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



Change-Id: I77065879a9c3d217c5e8b693d9553a4311e7f1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>