Merge "Fix the failure testCustomizedDhcpOptions_disallowedOption." am: f47788f76e am: 834f9cceb8

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

Change-Id: I44c7ee82d72afdd88f7711d71d9b0ab02c3014e5