Merge "Fix error color states and alphas and sizes of lock screen icons" into oc-dr1-dev am: 905fcf0787
am: c38935cc7c

Change-Id: I56cadd7939ad19ef0954fdf0a19ad11e3bc44eaf