[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: I8a5f3174c7c0b78cc7a263488e545e3b1c6f6e23