[automerger skipped] Merge "Fix NPE in DCT when ApnSetting is null" am:...

[automerger skipped] Merge "Fix NPE in DCT when ApnSetting is null" am: 64338246 am: ba3f17ea -s ours am: 6308ed27 -s ours am: 0220eb6b -s ours

am skip reason: Merged-In I39cafb5dab2ceff8e6e787dbeba189ae2a74fbea with SHA-1 af68a8ad is already in history

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

Change-Id: Iff51a80717d4acf4bcaceb15092ae2951f4a8f76