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

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

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