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

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

Change-Id: I73b048b562a54c16a76df81373e801aeaa425f69