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

am skip reason: Merged-In I3bfb6b322388c4f39e3370c6c1e1792dfe48ded4 with SHA-1 c4b074592f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/30532716

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