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

[automerger skipped] Change default IP protocol preference from AUTO to IPV4 am: 5b97250d -s ours am: e0bfc441 -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: I2799a7e6a5ba37aa56b63c90df0037f02d992e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>