[automerger skipped] Merge "DCT set up default before enterprise APN" am:...

[automerger skipped] Merge "DCT set up default before enterprise APN" am: 6428a56e am: c4c1cf37 -s ours

am skip reason: Merged-In Ib2f9594933d00307276f4538714a5354d36baf09 with SHA-1 d30c853a is already in history

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

Change-Id: Ie4a8dc8ee5f1842219c685a6d188d6431253ecb4