[automerger skipped] Merge "DO NOT MERGE: Audio HAL: Add missing device to XSD" into pie-vts-dev am: 999c5e83c4 -s ours am: 09947556ed -s ours am: 659e415612
am: 76d71b6a18

Change-Id: I8b044120d190731007d82b6fc5d7ab70c079b470