Merge "Audio VTS: Look for Audio policy config in all supported folders" into oreo-vts-dev
am: 5e74540849  -s ours

Change-Id: I91eac1061a1779984fde7cfadb5661471378fb83