Merge "Don't crash on null Intent in FingerprintEnrollFindSensor"