Merge "Add Key mapping to CEC_KEYCODE_SOUND_SELECT" am: 9f26142f3a
am: 12cb831abe

Change-Id: I9870995007d21dccd63188b5448a083841477271