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

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



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