Merge "EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e am: 1703e10721" into nyc-mr2-dev-plus-aosp
am: 2138547c90

Change-Id: Ie28ab4f3936bc05b7eda7446063217f8a4109054