[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

Change-Id: I32a71f971dc0e4433e073a4f92eb88a989aa937e