[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: 533bf0d913 -s ours am skip reason: Merged-In I87e23bb5f4bae7192d1c21956451c2f7c17b6cd7 with SHA-1 7ee893e477 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/gsma_services/+/31816546 Change-Id: Ibf5b40a60cf52966cf0927e939f953eae22a9a26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>