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

Change-Id: I42154ce2c57075c9e817a35a6596865b26f3c996