Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev am: a441922b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21598459



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