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

Change-Id: I692bcbf55598a2a3129d17fe01ec36e1b250c1dc