Merge "Un-finalize IpSecManager" am: 59f6394516

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

Change-Id: I6d6ad018c285066f4720389daaf5f3e7a7feeae0