[automerger skipped] Merge "Do not animate padlock when fp" into rvc-d1-dev...

[automerger skipped] Merge "Do not animate padlock when fp" into rvc-d1-dev am: 3457f405 am: cf15d4c6 -s ours am: 95f9570c -s ours

am skip reason: Change-Id If99d5b20d0f69491d38cfdbc21dfa8d2fe2d0edb with SHA-1 a7f79365 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12257808

Change-Id: Ica58e3eb388661502010330eea8008f44ecd325e