Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09 am: 6ca28e8362 am: 154779b6af
am: e886c7c2c1

Change-Id: I13b51a07246b83e1030f6d35b275bb9ea786e28a