Merge "Lockscreen fingerprint icon error color matches error text." into nyc-mr1-dev am: dbfdca3754
am: baada56277

Change-Id: I5187128058129e349e5d5bd97c15df400acb3bbc