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

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

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