[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 56dffa0099 -s ours am skip reason: Merged-In I9e3941f9ddea8785ec218d988e83294dd4346d52 with SHA-1 e0febabe5e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/AppSearch/+/30284913 Change-Id: I049d8d35cccfce4e306d3de1e9072075eebac242 Signed-off-by: Automerger Merge Worker <[email protected]>