Merge "Merge "Add Key mapping to CEC_KEYCODE_SOUND_SELECT" am: 9f26142f am: 12cb831a am: 23d8bfeb am: 602a53e4" into qt-qpr1-dev-plus-aosp