am 30ddbcdb: am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev

* commit '30ddbcdb680d1ace092fe8e377542a0f6dfc8436':
  Cancel enrollment when navigating out of enrollment
  String changes for app links in settings
  Remove data item from app info when not supported
  Monkey should not be allowed to switch USB mode

src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java

@@ -139,6 +139,9 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
         super.onStop();
         mSidecar.setListener(null);
         stopIconAnimation();
+        if (!isChangingConfigurations()) {
+            finish();
+        }
     }
 
     private void animateProgress(int progress) {
@@ -184,6 +187,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
     @Override
     public void onEnrollmentError(CharSequence errString) {
         mErrorText.setText(errString);
+        stopIconAnimation();
     }
 
     @Override