[automerger skipped] Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT am: b419fa0b -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: I8f7909cb764384303df7b86583fef9224cc0f884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>