[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: 1d2aaf2b -s ours
am skip reason: Change-Id I8c2390e5f3ca2d366d377f6da5822f24ca311c2f with SHA-1 5dcdec7e is in history
Change-Id: I4724a08e5cfb98c018c5297234e6a1521f98c24e