Merge "Un-finalize IpSecManager" am: 59f6394516 am: 44cc9d20d1 am: 4da8bc86b3

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

Change-Id: I65921b1d2887efae58dbd8e423d659e00dc98104