Merge "Fix UDFPS enroll to use correct fingerprint icon" into sc-v2-dev am: 539da553b6 am: 6ef538dbd1

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

Change-Id: I032cd71e48bce8ecf28a20db1337b33beae29233