[automerger skipped] Merge "Implementation of "Enable 2G" for Settings." am: 3ccc2738e2 am: 74de537b56 am: 2c9acf1094 -s ours

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

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

Change-Id: I4de0d4e0fc172dbe9fc45194783499e66fe46d15