Revert "Added multi-display support flag for shortcut helper"

Revert submission 34057912-shortcut helper multi display

Reason for revert: Droidmonitor created revert due to b/434943501. Will be verifying through ABTD before submission.

Fix: 434943501

Reverted changes: /q/submissionid:34057912-shortcut+helper+multi+display

Change-Id: Ic001842d25c9ce347c54c4eaf535d3415e705693