[automerger skipped] Merge "Fix lock icon animation for bio-auth." into...
[automerger skipped] Merge "Fix lock icon animation for bio-auth." into rvc-dev am: 24ec4739 am: d340674c am: 2fd10c23 am: ff2bcc26 -s ours
am skip reason: Change-Id I8c2390e5f3ca2d366d377f6da5822f24ca311c2f with SHA-1 27e34b2a is in history
Change-Id: I1fadde43a37e4b11b5ddcc06fa3c5ff3a442ad93