am b3a6d772: am bcf4164b: am 6657d551: 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 'b3a6d772f2b9f0dc0421040e79a80880dd6ec2eb':