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

Change-Id: I04fb9e7ca25320454f9a51b45a4cbe3931908d18