Fix APN Settings FC. [2/2]

Change-Id: Ia52e80400ce3d666aa9dc7eb515e6b3b1b808a64
Merge "Fix APN Settings FC. [2/2]" into jellybean-mr2.1