Merge "Cancel side auth on power press" into tm-qpr-dev am: 28b3fee2

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



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