[automerger skipped] Merge "Face and fingerprint re-enrollment notification"...

[automerger skipped] Merge "Face and fingerprint re-enrollment notification" into udc-dev am: 8c5cb88a am: 1e36f6d7 -s ours

am skip reason: Merged-In Ia9af235b6eefafd8508a42338aef39baf4f5c7ee with SHA-1 a46bf01a is already in history

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



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