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 am: 377b918c

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



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