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

* commit '8fe49c83b84964557b14cff9c8513e46aeee6d18':