Merge "Remove ServiceManager usage from IpSecTransform" am: 5a1c3525f1 am: dfffffedcb

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

Change-Id: I071e5c02bde272f5a79081c8a0164594d41f2c91