[automerger skipped] Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev...

[automerger skipped] Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061 am: c52d4922 -s ours

am skip reason: Merged-In I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23 with SHA-1 37858ea1 is already in history

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



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