Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev