Merge "Update audio VTS source code to match the change in AudioPolicyConfig" into rvc-dev am: ce3f17e662 am: f82f5ba5bd am: 604930993c

Change-Id: I3ec3cc45fe379f826462696e02cd22984186ced1