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 am: 231bd200 am: fac4d919
Change-Id: I9c37b0117b840fcba96e2daa974b7506cf5d8c2b