tree 0a4766b32f88291db922aee23c2eb0cea27e87d9
parent 5ff6a14e9e40905b545973358780240d027fd02d
parent df0053fc49e7f750da7d8701a6fb42b753cc0bc0
author Yan Yan <evitayan@google.com> 1602893360 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602893360 +0000

Merge changes from topic "new-ipsec-api" am: a80fb3bbe6 am: cb5aed6518 am: 4cddef19b1 am: df0053fc49

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

Change-Id: I18748127d0c97d9473c96678d556b03ad6048808