Merge "Merge "Add Key mapping to CEC_KEYCODE_SOUND_SELECT" am: 9f26142f3a am: 12cb831abe am: 23d8bfeb80 am: 602a53e409" into qt-qpr1-dev-plus-aosp