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

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



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