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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bbb587b66d7ebad1b197d27ce25dedb61fd2511