[automerger skipped] Merge UP1A.230905.019 am: b5ae782c42 -s ours am: 506dad81e9 -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: Ibe7aa96d3112811259b5fb4d66d01e8f1dd31d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>