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: f82f5ba5 am: 60493099 am: 62c48c13
Change-Id: I0d60e1aae654e3f6f5764f76e0a2016c26051f14