Revert "Revert "Update AppSearchSmokeTest to match latest AppSea..." am: a765a14ec5 am: d51540a8ce am: 8a88f1568d am: 9e9538974c

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/13468009

Change-Id: I1dafbae58a82336ce4d520f64187124a46a21c02