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

am skip reason: Merged-In Ie97ef69f6f9e7209e65c600ac78639a1c40e0fd5 with SHA-1 61740541b8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/30533589

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