Merge "Use IkeProtocolException#getErrorType() to identify a specific error" am: 7a50e7f206

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

Change-Id: I17956c626e473c6a86994e4f9a8f5f477487d9e3