Merge "Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag""
am: 16a29d84fa

Change-Id: Idcd5ccf3de4d225f75cd4352d86f321477fc0d58