Merge "Remove mobile network settings related declaration" am: efab62b4a8 am: 64ecc387a8
am: a31b47a8ee

Change-Id: I35fa13d52c54ffb6db9662ba0970fc9a13281db1