Merge "Disable DUN APN while roaming for certain carriers" am: 4becee9740 am: 5b22a598c6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371059

Change-Id: I784712ead1cb4c47e5a436d8fe33655b51847879