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

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