Merge "Always enabled the Advanced Option under Mobile Network Settings" into oc-mr1-dev am: 0c6d2f6917
am: 2b44ea0930

Change-Id: I1b60480c2b1e16f10ee5c7209c71f3a454e54314