[automerger skipped] Merge "Make all DHCP option numbers public." into rvc-dev am: 01673425 am: 9a8cf456 am: f9a71a5e -s ours

am skip reason: Change-Id I939bfac5ec14175b74ce3713f5af1362de577839 with SHA-1 e8198fc2 is in history

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

Change-Id: I21b5692485cc37bea5676dac74ce1d3fce1e04de