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: a67e72ab am: 9212e9a3 am: 47987973

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



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