Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev