Merge "Use token to identify IKE Session" am: 2775f8a1d1 am: 86c048a4d7

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

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