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