Revert "Allow shortcut predictions in hybrid hotseat"

This reverts commit 2d8e882d2ec6cb8aa846c584127e57e26168f1f9.

Reason for revert: Moving this to master. 

Change-Id: I46cfbda92d74a1f9fa9f0c091811941fe74ce76b
2 files changed