Merge "Fix several test packaging issues in AppSearchServicesTests." into tm-dev am: 32f21f81e9 am: af99bc4df3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/AppSearch/+/17741343

Change-Id: I343d35f7f835daf8d2e8367479d0c068c39c0dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>