Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev am: c07c23b1f7  -s ours am: 1255f26551
am: 83ee844603

Change-Id: I642d1c595075d577a3919f5975b77e422f7ebcad