Merge "Update multichannel audio policy handling" into lmp-dev