Merge "Remove ParcelFileDescriptor hidden API usage from IpSecService" am: ff35093684 am: 04e2efc144 am: bbc431f3ea

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

Change-Id: I7a6724284f29f05e7bbd9ee2a1ad671fd442e519