Merge "net: fix NPE when reading IP configurations" am: eed1a20c65 am: eec8e24ef3 am: 0e0ba33ccc

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

Change-Id: Iaf0991704d248264adad4c0f15583139c0e55441