Merge "Address API review comments for DhcpOption object" am: 446c376434 am: 36b048973c

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

Change-Id: I3190afdf753cf16060632e4dece6fcd87bd5af6b