Merge "Merge "Move haptic from FaceAuthenticationClient to SysUI(1/2)" into...

Merge "Merge "Move haptic from FaceAuthenticationClient to SysUI(1/2)" into tm-d1-dev am: ccdf34d9 am: be6726fe" into tm-qpr-dev-plus-aosp am: 4a075310

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



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