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