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

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

Change-Id: Iee87b5751d6216e29f64bca1bd91c70cd14d8875