Merge changes from topic "tc_change_22071422_22" into tm-dev am: 35b01a26 am: 61b101bb

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



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