Merge "Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7" into oc-dr1-dev-plus-aosp am: 8d1471aebe"