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

[automerger skipped] Merge "Disable DUN APN while roaming for certain carriers" am: be4d8e7f am: 2a8b8737 am: d3e43ee8 -s ours am: 2b678e40 -s ours

am skip reason: Change-Id I38afd17475bbdb1dff80fbd82e70cf468dece652 with SHA-1 a28bf2a4 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1371117

Change-Id: Id11fe6a92cf5bdc5a61733c1b88be4ae55af366a