[automerger skipped] Move haptic from authenticated to confirmed (when...

[automerger skipped] Move haptic from authenticated to confirmed (when required). am: ee846efe -s ours am: e4abdaee -s ours

am skip reason: Merged-In I8d9324384680367af7991eab9b5ce42bf378e8bc with SHA-1 e072fe34 is already in history

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



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