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: 5e01fcaf

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



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