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

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

Change-Id: If6cbecd0b69bad0b15fb922da2c6bdc3673e0559