Merge "audio policy: fix getOutputFromId and getInputFromId" am: f8d13dee65
am: 4d9a25ccf0

Change-Id: I676995ac79a1900df5ccee86a9f36fbed70fb0b7