[automerger skipped] Merge "Implementation of "Enable 2G" for Settings." am:...

[automerger skipped] Merge "Implementation of "Enable 2G" for Settings." am: 3ccc2738 am: 74de537b am: 2c9acf10 -s ours am: 8a261dfb -s ours

am skip reason: skip tag Change-Id I81052549f8dde491697c35365320145fd24c3842 with SHA-1 8fa54b7c is already in history

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

Change-Id: Ia8a470b5ae8e0c22cc4637b6fdd6ae99737ca886