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

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



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