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: I68d47c54d523071b3765b630bb0615b6bb67e6e4