Merge "Refactor IpSecServiceConfiguration to Dependencies" am: 033ccab2a0 am: ec882c674c

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

Change-Id: Ie7256dcb6a5a1942de84b49cf280ba0b7e6151c2