Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed

Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb