Merge changes from topic "nullable-ipconfig" am: 1b13af010a am: 3a74a64079

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

Change-Id: Idd172582e5d1f0d401b999b7eb8f1a5e5311ee5d