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

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

Change-Id: I5d9cbec1a435e972d4123e3c7269df9ca82a5a16