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

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

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