[automerger skipped] Merge "Revert "Fix the flicker of FingerprintSettings...

[automerger skipped] Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev am: 1dd3fefa am: 88c9b00b -s ours

am skip reason: Merged-In I1fcc8b3ecd42859af591a7b250edfedbbdf204e4 with SHA-1 391a34f7 is already in history

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



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