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

Change-Id: I878a5fa528b051f6de6ae257c5a4fcd3c9258fef