Merge "Fix screen turns off once triggering long press power behavior" into...

Merge "Fix screen turns off once triggering long press power behavior" into udc-qpr-dev am: 01a9c09f

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



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