Merge "Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT" into udc-dev