Merge "Use TelephonyManagerShim factory method" am: 9076b0d6a4 am: a38af7e676

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2026563

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