Merge "New keyguard icons" into oc-dr1-dev
am: 6df24d2f42

Change-Id: Ia77834f46449f18f02aa9d6d17a3d2141087515f