Merge changes from topic "tc_change_22071422_22" into tm-dev am: 97c50202e0

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

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