Merge "Add makeDependencies method in IpSecService related tests" am: 3c1e7398a4 am: 48a661cbc9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904464

Change-Id: I5a0d553f9fb218aab1010f3ce93bab14f47b4110