Merge "Reduce Repetitive Calls to TelephonyManager From Telephony2gUpdater" am: 601707f9fe

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

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