Merge "Fix fingerprint dialog icon color" into pi-dev
am: 7c97601a43

Change-Id: I2e6fd42656d56b91a18f030d18f70c7b81081b01