[automerger skipped] Merge "DO NOT MERGE: Audio VTS: Wait after stream close" into pie-vts-dev
am: b0a0799f56 -s ours
am skip reason: subject contains skip directive

Change-Id: I15a325788981ed44efccb55cc63b4ea2236aecfb