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

Change-Id: Ie4351214824d5a9ccce6a3e6f83bb24dedfa20f9