[automerger skipped] Merge "Prevent double animation of lockicon when waking."...

[automerger skipped] Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea01585 am: b0471d9a -s ours am: 5bc9e419 -s ours am: a49252dd -s ours

am skip reason: Change-Id I79e1bbde2c5cb5fe588a29111294fab68c546c7c with SHA-1 50883d72 is in history

Change-Id: I9862e87a0adf5f4f43624b3150ce2d5b0f146861