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

am skip reason: Merged-In I90b57a86788c61a8f90ec4f7a6528ba68bc85d44 with SHA-1 b0aeb39cdf is already in history

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

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