Merge "SideFPS bp cancels on power press" into tm-qpr-dev am: 137613f4

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



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