Merge "Audio VTS: Look for Audio policy config in all supported folders" into oc-dev am: 4f3c28ad7a
am: b06f544d22

Change-Id: Ia2dda3abb97742f7fcb6a98568c2e095944c38a6