[automerger skipped] Merge "Un-finalize IpSecManager" am: 59f63945 am:...

[automerger skipped] Merge "Un-finalize IpSecManager" am: 59f63945 am: 44cc9d20 am: 4da8bc86 am: 39e60683 -s ours

am skip reason: Merged-In I29f3ac96f83b4271f29a7051d33ccf47a0dd6c57 with SHA-1 0329922c is already in history

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

Change-Id: If1738a59090e0e72b887c4e9fcfae05505716409