[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: 687acec3 am: 86859a79 am: b2f4ca95 -s ours am: ed4045bf -s ours

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

Change-Id: Iad197a603bbbfa6ab5826554c57511ff309d42ae