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