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

Change-Id: Ic3a041b56b0f5ca01b6b098b8fdd748ea163d654