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 am: 5ac62c8c

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



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