Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
am: fb8e9b9096

Change-Id: I2ce2160b4ffa4f088321710a33475debfd7b1212