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

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

Change-Id: I9ad5d7bdb2c9aa08bcfeca78c0a4858101f28444