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

Change-Id: I0a367b53e4c85ea3db4b8452073c64d836aa721e