Merge "Use IPv4v6 as default protocol when APN setting is not available" am: 8c9142fca2 am: d67be5c22e

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

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