Merge "Refactor IpSecServiceConfiguration to Dependencies" am: 033ccab2a0 am: ec882c674c am: 94f55de980 am: 364b846ea1

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

Change-Id: I1d13291c3fb9000cd0819c661bc004608c1935ba