Merge "Audio VTS: Wait after stream close" am: 1f004177c6
am: 98d63d2b1d

Change-Id: Ifd6494bde7cea7b691a33d2cdcc8424bb12d3d98