Merge changes from topic "tc_change_23050307_32" into udc-dev am: b3764697 am: db6f757e

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



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