Merge "Explicitly exit from the am instrument after test completes" am: 7e76d37fdb am: e13662e50f am: 1ec0427058

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1877024

Change-Id: I0fb1a383bb5faed5a47dd23cb0eb8ac044cd6bbb

cmds/am/src/com/android/commands/am/Instrument.java

@@ -545,6 +545,8 @@ public class Instrument {
                 mWm.setAnimationScales(oldAnims);
             }
         }
+        // Exit from here instead of going down the path of normal shutdown which is slow.
+        System.exit(0);
     }
 
     private static String readLogcat(long startTimeMs) {