Merge "Updating Telefonica-BR APNs" am: a9d25fed8c am: ff44b0c809 am: fd2fad136c am: f408a1b466

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

Change-Id: I455f72c619d6d2843501d232b901b0e26b68f912