Merge changes from topic "tc_change_23042206_57" into tm-qpr-dev-plus-aosp am:...

Merge changes from topic "tc_change_23042206_57" into tm-qpr-dev-plus-aosp am: 73b9a735 am: 2da9d688

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



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