Merge "Introduce Telephony2gUpdater to Apply 2g User Restrictions" am: 4183aedcf6 am: 821604f3ad

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

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