Merge "Modify ApnEditor app for new APN schema." into ics-factoryrom