Use ONC for Cellular APN and SimLock in Settings

chromeos/test/data/network/translation_of_shill_cellular_with_state.onc

Index: chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
diff --git a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
index d7d6b337dea45b4e2e9e93663bca2cb7ed9464a1..e57d0572303b6a22c28b1af62291f7563c8e6b2f 100644
--- a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
+++ b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
@@ -15,24 +15,25 @@
       "Name": "test-name"
     },
     "APN": {
-      "Name": "test-apn",
+      "AccessPointName": "test-apn",
+      "Name": "test-apn-name",
       "Username": "test-username",
       "Password": "test-password"
     },
     "APNList": [ {
-        "Name": "test-apn0",
+        "AccessPointName": "test-apn0",
         "Password": "test-password0",
         "Username": "test-username0"
       }, {
-        "Name": "test-apn1",
+        "AccessPointName": "test-apn1",
         "Password": "test-password1",
         "Username": "test-username1"
       }, {
-        "Name": "test-apn2",
+        "AccessPointName": "test-apn2",
         "Password": "test-password2",
         "Username": "test-username2"
       }, {
-        "Name": "test-apn3",
+        "AccessPointName": "test-apn3",
         "Password": "test-password3",
         "Username": "test-username3"
       }