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

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



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