am ce01bd6e: am ee499fe6: Merge "Fix 6504124: Disable assist when...
am ce01bd6e: am ee499fe6: Merge "Fix 6504124: Disable assist when ACTION_ASSIST is not available" into jb-dev
* commit 'ce01bd6e':
Fix 6504124: Disable assist when ACTION_ASSIST is not available