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

Change-Id: I539b20c2a305fed41025db86e0b7813713db3bb0