Merge changes from topic "tc_change_22071422_22" into tm-dev am: 35b01a26 am: 4e1b8e79

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



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