[automerger skipped] Merge Android U (ab/10368041) am: 8422e79d25 -s ours

am skip reason: Merged-In I58d1bd2c60cd99517546659d17607563854c9f84 with SHA-1 765e9afab8 is already in history

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

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