Merge UP1A.231005.007 am: ffdcde0157 am: db085d60af

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

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