Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870

Change-Id: I10a5f94e302ef87490c2d4daa327a2207698de48