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