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

Change-Id: Ie61b885b1e63f1a0a8dc27991334e8bf0da823f7