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

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