[automerger skipped] Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev am: 8a0074e909 am: f5ffb13dc1 -s ours
am skip reason: Merged-In I057b00fbca6660012887ebedf4d65c2c3d35792b with SHA-1 6bed01f315 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20414916
Change-Id: I40db91dc44b25ef1d6772c70faa50c13bf3d2f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: