Merge changes from topic "customized_dhcp_options" am: 2e86fd1b9b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id11c372554dc9dc30d3afb8d586e90d7a9c8d37a