Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: Ie3a809e901745d7143d0b2b48023f2ddd3671480