[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: fc4b5e63aa -s ours am: b2004e43d1 -s ours

am skip reason: Merged-In I2c179c495a46418452a03c3fe67c2dbdff16629e with SHA-1 1a43bf9c61 is already in history

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

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