[automerger skipped] Merge 24Q3 to AOSP main am: b73933af39 -s ours am: 38a03f896b -s ours

am skip reason: Merged-In I5a8f249a745fda3e51543464ca7ff597dc8d3c54 with SHA-1 c545583d8e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/3257937

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