Merge changes from topic "tc_change_22071422_22" into tm-dev am: 97c50202e0 am: 3b68cf2f58 am: 720eb86f8e am: 4879450cb8

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

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