Merge "Fix crash in APN settings. Bug: 4968921"