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: 683416ac" into oc-mr1-dev-plus-aosp
am: 4e4d94f9
Change-Id: I148142669af68a7caedd75a91c876716e0b06feb