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

Change-Id: I50d3b2a37658a902a6a95352e7be2cc58813f104