[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 0132ff1627 -s ours

am skip reason: Merged-In I1403fb64502e5b731ae08a51df8198801314c951 with SHA-1 c7faff76cf is already in history

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

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