Merge "Un-finalize IpSecManager" am: 340aa33c2c

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

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