[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

Change-Id: I7d90ad8a7b5469d7e222518c5ccff37089c950af