Merge "audio policy: fix selected device Id in getOutputForAttr" into sc-dev