[automerger skipped] Merge 24Q3 to AOSP main am: 0ca20d2f1a -s ours

am skip reason: Merged-In I9e428cdc69dd03e70f03ca60fe3a7f0c5d599def with SHA-1 c860546869 is already in history

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

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