[automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours am: 01b3da1dbd am: 70aa2882a6

Change-Id: Ic649d0d9dc9884139343a6017d600e3e1065c91f