[automerger skipped] Update audio VTS source code to match the change in AudioPolicyConfig am: d24ab2ba3a am: 73053bf46d -s ours am: cf5e5ea9bf -s ours

am skip reason: Change-Id I0fed71eba8d031465ef98da2bf6be16c2fbfb5ff with SHA-1 20a3e395bf is in history

Change-Id: I212ef547dee889242e1eef8123922163b97a13e3