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

Change-Id: Ib270a235f58fec3d2d8c808d3f45433c6f2031c6