Merge "Allow partially dynamic profile in the audio policy config am: e54b381d9d  -s ours am: 615a9a5925  -s ours" into oc-mr1-dev
am: d92e09a589  -s ours

Change-Id: I2c03dbd0601f5f3ca6152cd5cb60566657544a8d