Merge "[automerger skipped] VTSHalAudio: Increase test timeout for V6, V7.x to 10 minutes am: 83cf51eb33 am: 23ce0e42c1 -s ours" into tm-d1-dev-plus-aosp