Merge "Revert "Shortcut integration with AppSearch (Part 6)"" into sc-dev am: 06af0988dd am: 5588d073f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13988906 Change-Id: I0469a22a80ab181c61c76789ba5d18b5fd02eb4f
This commit is contained in: