[automerger skipped] Merge "Update default value of...

[automerger skipped] Merge "Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT" into udc-dev am: 91a777b5 am: a744d7ac am: 6cb27ac3 -s ours

am skip reason: Merged-In Ie2b42e69702609b132acd6bd087292bf9df365cb with SHA-1 b419fa0b is already in history

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



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