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

Change-Id: If99689b79fa86283bf198412ef506c91d3ffb1ab