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

Change-Id: I74c02f4f9430ae8780b6a32e0c318174dce0c5c3