Merge "JvmtiAttachingHostTest was flaky due to activity start failing"
am: c43c41309f

Change-Id: I9d318ed43c3df4eac6e1cd784a2931e1d304c628