Merge "Fix the failure testCustomizedDhcpOptions_disallowedOption." am: f47788f76e

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

Change-Id: I032cbd5196844c4174cda264e1b206ee9e333f42