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

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

Change-Id: I56b055d936e12b179ac7c7f62bebe6364e34d4c2