Merge changes from topic "customized_dhcp_options" am: 2e86fd1b9b am: 1c09d1c04d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2af2287bec3b9df316578c2a52c662a69db1fb85