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

Change-Id: I73379d70d444ce4fafbcfb52f6aa1a7eaceee8af