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

Merge changes from topic "tc_change_22071422_22" into tm-dev am: 35b01a26 am: a1f6709a am: 7cb4bbfa

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



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