Merge "Revert "Fix the flicker of FingerprintSettings before...

Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev am: 1dd3fefa

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



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