Revert "Shortcut integration with AppSearch (Part 6)"

Revert "Shortcut integration with AppSearch (CTS for number of s..."

Revert submission 13953754-shortcut-limit

Reason for revert: affecting multiuser and perf test
Reverted Changes:
I7b901b854:Shortcut integration with AppSearch (Part 6)
Ief09d3877:Shortcut integration with AppSearch (CTS for numbe...

Change-Id: I983e4e51cf951599d8273e0879cc09954738af3e