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

* commit '9550d4f8769ad8adf3c1c495bcb2168bea3c506f':