Merge changes from topic "tc_change_22071422_22" into tm-dev am: 97c50202e0 am: 3b68cf2f58 am: 1dfcc9310c

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

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