DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc am: a2c32a3b91
am: 2d83e3a357  -s ours

Change-Id: I4ee505b11ae0bfd56f7f608a4d32fbf735f2df57