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

Change-Id: I19a207e437d6d583daca3aa53da3d2ab34079748