[automerger skipped] Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT...

[automerger skipped] Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT am: b419fa0b -s ours am: 7ef6ff72 -s ours

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

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



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