Merge "Do not animate padlock when fp" into rvc-d1-dev am: 3457f40589 am: 574c7d8fe2

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

Change-Id: Ic0aec8af362e9a934f8eed6d00aa7c0568eb61bd