Merge "Merge "Revert "Audio HAL: Add missing device to XSD"" into pie-vts-dev am: 75cfcfd3e2 am: 08880e6745 am: 803b7d9f18 am: 6800e0a846 am: f837f71cfa" into qt-qpr1-dev-plus-aosp
am: 5eb8ec2d42

Change-Id: I6a2589644fd85ecb944edcd93019b8de1e98ab70