Merge "Merge "Update audio VTS source code to match the change in AudioPolicyConfig" into rvc-dev am: ce3f17e662 am: def82fe687" into rvc-d1-dev-plus-aosp am: 13a366b079

Change-Id: Ic72e71a9f1386e37f0651a4eafcfd3714b222ecb