[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

Change-Id: If35265d57f6e57b38a69e4706d6fead727eebdb7