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

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

Change-Id: Ie80092cbec7b1ca49a06ce960bccb5964423e5d3