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

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

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