am fb7b0f3d: (-s ours) am 9550d4f8: am 8fe49c83: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible memory overflow

* commit 'fb7b0f3d27c53096708cea23aa4dc7e829ef36d7':