Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev