[automerger skipped] Merge "Change default IP protocol preference from AUTO to...

[automerger skipped] Merge "Change default IP protocol preference from AUTO to IPV4" into udc-dev am: 4ca1887d -s ours am: 3779fc11 -s ours am: 92205067 -s ours

am skip reason: Merged-In Ia0a6bd11d25fd67edb0a301e81626ec4f174155a with SHA-1 4a340679 is already in history

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



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