am 38b00a63: Merge "More AudioPolicy registration" into lmp-mr1-dev
automerge: 5a51050

* commit '5a51050519a3738488a4f7186e9822c448362a37':
  More AudioPolicy registration