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

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

Change-Id: I3bdc6b741203eb1e091cea471a43f9027c5cb7fc