Merge "Lockscreen fingerprint icon error color matches error text." into nyc-mr1-dev