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