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

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

Change-Id: If962a606cb85164d57356039761590aa988267f2