am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff automerge: b4aa5b3
automerge: 6f1b9e2

* commit '6f1b9e2ad7e972d0498f71439bd25c92f748d0e9':