[automerger skipped] Merge "Disable DUN APN while roaming for certain...

[automerger skipped] Merge "Disable DUN APN while roaming for certain carriers" am: 4becee97 am: 5b22a598 am: 47df766f -s ours am: 52413a80 -s ours am: 05832ae0 -s ours

am skip reason: Change-Id I2e633fd764f86b196a6ee0c29af2b97733e82c66 with SHA-1 db897af7 is in history

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

Change-Id: I8e98ee78e1734ddf6f12e7aedf8c44e0046905d8