[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: f1961e4a8a -s ours am skip reason: Merged-In If747db67f30bd8fc419b1042a3df90c633e36db4 with SHA-1 b424e19786 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/gsma_services/+/27273328 Change-Id: Iece766b053e1c8c73b2fde46270f5af3a76df249 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>