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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idecccd35184653f9b6dd8fe7015767f5e3ad48c1