[automerger skipped] Merge "Fix lock icon animation for bio-auth." into rvc-dev am: 24ec4739 am: 1d2aaf2b am: 3667a9a0 am: 4a277a54 -s ours am: 783e2ca4 -s ours

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

Change-Id: I37494189dc4f92b99d4e7f040ec1655c89031c6c