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

Change-Id: Ie37e24c2d5817902d467ac6a4669b8c21607831e