am c42c4b52: (-s ours) am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible memory overflow
automerge: 5c4c113  -s ours

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