Merge "Disable APN settings preference when DPC APNs are enforced"
am: 9800507064

Change-Id: Ifac22c1e507053ec1e7e8801bc9657f6c643416f