Merge "Add a new keycode for TV (ALL_APPS)" into oc-dev am: 6afce442ea am: 047fcbf671 am: 0890383957
am: d35a6de75d

Change-Id: I24129d0d010ab20c837ca6b49894ece804366d60