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

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

Change-Id: I6f37ef755959b49efd29b64a8b168cf1fab53d6c