Merge "Merge "New keyguard icons" into oc-dr1-dev am: 6df24d2f42 am: ff660190e2" into oc-mr1-dev-plus-aosp
am: 4b7fb86e42

Change-Id: I0f43786bbbdbc786fb339d515ecd96dcc2865671