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

Change-Id: I7e14539d3b22918c8d4a1aa4d41ba96afe88ca1c