[automerger skipped] Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: b0471d9aa8 -s ours
am skip reason: Change-Id I79e1bbde2c5cb5fe588a29111294fab68c546c7c with SHA-1 50883d72aa is in history
Change-Id: I998729649469f7687fdb973a53d8b94ff271d683
This commit is contained in: