Merge "Make ASSIST launch VIS and add a new keycode for TV (ALL_APPS)" into oc-mr1-dev
am: 224e2daf5b

Change-Id: I190f74604641a988cd8cb6e7067abaaf624eb1df