am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible memory overflow

* commit 'c42c4b526422fada02f3522a08143f738e9e60af':
  DO NOT MERGE - audio policy service: fix possible memory overflow