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

Change-Id: I0655332790db377e24953ba541daa48196615b58