Merge "Correct APNs with apn attribute default" am: add27b23f0 am: 858c31e394

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

Change-Id: Idc14f522c3ba4489e42e558694d82c32f92f49ae