Merge "Revert "Remove mobile network settings related declaration"" am: 09bccfbd98
am: 8c9a913cd3

Change-Id: I16af93c04657a20b947cb7dd13cd9fd3a2a70ba5