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

Change-Id: I2b59387567bfe58ecd172bb412303c716a00a27c