Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev...
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev am: c07c23b1 -s ours am: 1255f265 am: 83ee8446
am: f8554c07
Change-Id: Idab584cbee09f1c36fb908400557374389e96478