Merge "[Settings] Refractor ApnSettings code to independent package folder."