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

Change-Id: I71cbb691f3bfe8d4d37fd09d5d1bc5ef83146090