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

* commit 'b4aa5b3b85d871d33ee6350a7838d9c2cafb03ca':