[automerger skipped] Merge "Log UiEvents whenever FaceAuth is triggered." into...

[automerger skipped] Merge "Log UiEvents whenever FaceAuth is triggered." into tm-qpr-dev am: f506a907 am: ef50a0d6 -s ours

am skip reason: Merged-In I6cb04f7cccdaf92e77b8e5691bf5ac458928ff86 with SHA-1 5a5e533f is already in history

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



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