Merge "Add and change APNs for Switzerland mcc228" am: 3be412d7d5 am: 7f4f2da0a6

Original change: https://android-review.googlesource.com/c/device/sample/+/1974221

Change-Id: I6d490286c26ecd3f7438c492585363e2f4b4e2e1