Merge "Un-finalize IpSecManager" am: 340aa33c2c am: 377760ccc0 am: 0b9d8307f5

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

Change-Id: I65921b1d2887efae58dbd8e423d659e00dc98104