Merge "Update audio VTS source code to match the change in AudioPolicyConfig"...
Merge "Update audio VTS source code to match the change in AudioPolicyConfig" into rvc-dev am: ce3f17e6 am: def82fe6
Change-Id: I15aaf897fe37298ea91c6d65cf4d151f4acb09e0