[automerger skipped] Merge "Add animation for progress bar and lottie in fingerprint enrollment" into tm-qpr-dev am: a48f8944f9 am: e57000f2c4 -s ours

am skip reason: Merged-In I547d86182a87846aca7d025b35a008675f449e2e with SHA-1 e211c103b8 is already in history

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

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