[automerger skipped] Merge "SideFPS bp cancels on power press" into tm-qpr-dev...

[automerger skipped] Merge "SideFPS bp cancels on power press" into tm-qpr-dev am: 137613f4 am: 90eea709 -s ours

am skip reason: Merged-In I1e7851ccd1d3045fee847c532b5b7d991ed0fe4a with SHA-1 cccf5375 is already in history

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



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