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

Change-Id: I0eb25c089d36a36c2546b017cee33c4c7492adc7