Merge "Use TelephonyManagerShim factory method" am: 9076b0d6a4 am: 4710397bf8

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

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