Merge UP1A.231005.007 am: ffdcde0157

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

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