Merge "Use TelephonyManagerShim factory method" am: 9076b0d6a4

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

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