[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 -s ours am: 3aac1e12 -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: I60a9c86dc3180eed97af9667c1316a69825306c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>