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

Change-Id: I437c224fc8a54a608edd616c63f957c2cdadf665