[automerger skipped] Merge "Use IPv4v6 as default protocol when APN setting is not available" am: 8c9142fca2 am: d67be5c22e am: 6a2df39194 -s ours

am skip reason: Merged-In Ic61fa42f99750e6e48ea1cd08f058af3fd67c551 with SHA-1 1ec4942f8c is already in history

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

Change-Id: I49c04904c50f7b47587fd2a684dd84c95bd08b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>