Merge "Add and change APNs for Portugal mcc268" am: ee6c2048ba am: 8445fca014 am: a7ba662091 am: 4e0877511e

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

Change-Id: Ic5a778df270f1ca9ea4c716aab1e7378a505842b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>