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
Change-Id: Ib9059bc76bf3e1cb5f3fb5fc55183edbfe0775bb