[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 072c378040 -s ours am: abad85b03a -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: I97b6a5e5787d560f09f473e058a286f7d4b3b632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>