DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc
am: a2c32a3b91

Change-Id: If52fe6c02e707465a074527221fbe851ad51085a