Merge "Extend test timeout value from 180s to 600s" into android11-tests-dev am: 6f19ba03b3

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1563112

Change-Id: I206eac55121c658f3d071117467ce841c18a2685