Merge "Implementation of "Enable 2G" for Settings." am: 3ccc2738e2 am: 74de537b56

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641783

Change-Id: I43640a7ef47ca09c08d042b8d4ceb76b5c54c4eb