Merge "Add audio device type AUDIO_DEVICE_IN_HDMI_ARC"