Merge "Explicitly exit from the am instrument after test completes" am:...

Merge "Explicitly exit from the am instrument after test completes" am: 7e76d37f am: e13662e5 am: 1ec04270 am: cdb9983b am: d43dd577

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

Change-Id: I10a967e28dd66a60ce83f203d5400a1b640976f2