tree 6ac6940fd4cb70ffd47b6ab631c2f0311b8f03ff
parent 3bdaabfc660835912c0040fd0ce38f03b5228532
parent 7720b1f3d942994436e6edf4132e30a00e27822c
author Lorenzo Colitti <lorenzo@google.com> 1612199553 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612199553 +0000

Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 5a700b2725 am: f681bee340 am: 7720b1f3d9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8e99aeefffddf88240cf5f1d7117e022242708f