Revert "Porting AppSearch jetpack upstream changes to platform"

This reverts commit 93e2122828af7297666c846c1ed0a3128b17ef2e.

Reason for revert: <Bad merge, doesn't compile on top of ag/13173954>

Change-Id: I240ebae5eccc81c3c7e6fad7f755f2de0f4ba54b
5 files changed