[automerger skipped] Merge "DO NOT MERGE Ensure testRunEnded is always called in JarHostTest" into oreo-cts-dev am: 4ac0e76869  -s ours
am: 9fe5d931d1

Change-Id: I08c5c3e5b05543e13c370708c98139a1ed7157a3