[automerger skipped] Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: b0471d9aa8 -s ours am: 5bc9e4196c -s ours

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

Change-Id: Ibcf1c63c89f9da15b164c1c2e4670e4ccf346dec
This commit is contained in:
TreeHugger Robot
2020-05-05 15:26:10 +00:00
committed by Automerger Merge Worker

Diff Content Not Available