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

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

Change-Id: I10a967e28dd66a60ce83f203d5400a1b640976f2