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

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

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