Merge "DO NOT MERGE Ensure testRunEnded is always called in JarHostTest" into oreo-cts-dev