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

Change-Id: I43a48595607a1c38475aec81232008ac76cdd5b1