Merge "[automerger skipped] Merge "Fix lock icon animation for bio-auth." into rvc-dev am: 24ec4739 am: 1d2aaf2b -s ours" into rvc-d1-dev-plus-aosp am: 333a3e8f -s ours am: 19efbbc3 -s ours

am skip reason: Change-Id I8c2390e5f3ca2d366d377f6da5822f24ca311c2f with SHA-1 5dcdec7e is in history

Change-Id: I96efaf93c896ec459ac6f18be021c490975d37be