Merge "DO NOT MERGE: Extend jvmti agent waiting time for low-end device" into oreo-mr1-cts-dev