Merge UP1A.231005.007 am: ffdcde01 am: db085d60 am: c0406ad7

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



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