am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev

* commit '705def9a227fb19290308a815049e75f62005bee':
  [Fingerprint] Send RESULT_CANCELED when back from Add another