[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: 574c7d8f am: 815516e7 -s ours

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

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

Change-Id: I9336b1044e5d9d29b9daa760136b8769674d6388