Merge "Fixed additional lottie flicker in fp settings." into tm-qpr-dev am: 0dd635f2

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



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