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

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

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