[automerger skipped] Merge "RESTRICT AUTOMERGE SFPS: Don't play auth haptics...

[automerger skipped] Merge "RESTRICT AUTOMERGE SFPS: Don't play auth haptics if power button pressed" into tm-qpr-dev am: b8359025 am: 07dc623f -s ours

am skip reason: subject contains skip directive

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



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