[automerger skipped] Merge "VTS: Do not require XML for Audio effect V2" into...
[automerger skipped] Merge "VTS: Do not require XML for Audio effect V2" into pie-vts-dev am: 5e6dd128 am: 2642ddb8
am: c7f43331 -s ours
Change-Id: Ia21ac2d6c42c1f349608ad24cf47472fc2edc029