Merge "Merge "New keyguard icons" into oc-dr1-dev am: 6df24d2f am: ff660190" into oc-mr1-dev-plus-aosp