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

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

Change-Id: I2a57089e36b2310f165ad98aef8d3e37347b49d4
tree: 8409ae1b9456867572fb0ae1936b43a4771328e0
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/