[automerger skipped] Merge "Cancel side auth on power press" into tm-qpr-dev...

[automerger skipped] Merge "Cancel side auth on power press" into tm-qpr-dev am: 28b3fee2 am: 2a0e8399 -s ours

am skip reason: Merged-In I4b2f5ea1f7fe94b62071fb51b53224b1ca5756d0 with SHA-1 e37ac352 is already in history

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



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