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

Change-Id: I8aff50265f48590f3549ac5fdb7f0256dc476132