Merge "Extend test timeout value from 180s to 600s" am: 276369a3df

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16ae7e3114b89738237b8ab6d1cbe586162663e9