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

Change-Id: I4e8700b1a77b8d65fa97ca462dbf6249a9873f77