Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061d3

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

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