Merge changes from topic "nullable-ipconfig" am: 1b13af010a am: 32f38841ba am: 0b415c8aea

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2026565

Change-Id: I1b547f99e9adc07b71e757cf414982450824dc46