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

am skip reason: skipped by user jtinker

Change-Id: I41cccce692c4cd294c74054cb072e0ada6f41941