Merge "Update audio VTS source code to match the change in AudioPolicyConfig" into rvc-dev am: ce3f17e662 am: def82fe687 am: 231bd20093

Change-Id: I1914a9d465ea23ca998946d4b292ef25d4e7db49