Merge "Increase default timeout for ART gcstress tests" am: e6d11bbbc6 am: 4644759d4c

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1711925

Change-Id: I4bfeab6af87ae882af88a66560850f0d821244b2