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

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

Change-Id: I33f414bf8770bf4403131d042039d68dac4126eb