Merge pull request #9621 from jaoo/869873

Bug 869873 - [Settings] Disable both 'Call Settings' and 'Cellular & Dat...(cherry picked from commit 4918f1d0de02d39e818b0c209ff5a168720d2bfc)
 - Also fixed Bug 884142