am 67b7360b: (-s ours) am 82fd850e: am 414af268: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible memory overflow

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