Merge "Merge "Fix error color states and alphas and sizes of lock screen...
Merge "Merge "Fix error color states and alphas and sizes of lock screen icons" into oc-dr1-dev am: 905fcf07 am: c38935cc" into oc-mr1-dev-plus-aosp
am: c3a18c6b
Change-Id: I623bd321518480ee7ff57dba4e8807bf243cac68