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

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

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



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