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: I1e99d435eac137b380e8804dca31f97015d2641f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>