Merge "Change default IP protocol preference from AUTO to IPV4" into udc-dev am: 4ca1887d

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



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