Merge "Migrate/restart IKE session with delay upon net update" am: 0a653fdd2a am: d1eab46425 am: 6ac0a1a3eb

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

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