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

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

Change-Id: I6f856ff33b3b04e69f620e8b524557c9e86db239