[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: 4cd28b22 -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: Id3dc9f6fa7a5ad4fe5787fbc188600076a84939c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>