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

Change-Id: I5a2e0b4c4f4d91a1618ba6ad4f848b3ccf98a5a0