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

Change-Id: I87c316c7b1738e9a85b867088a074536bc5e9db1