[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: e7749007e5 -s ours am skip reason: Merged-In I23cbadc31c48413afcdf52cc6d3768611b9df083 with SHA-1 cbc2aa5364 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/gsma_services/+/27908781 Change-Id: I0621051c999ca63d566c5c0f7e89c7836d0d8980 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>