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

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

Change-Id: Ic6e55fc376073d9563e768c9915002e460ec8c31