[automerger skipped] Merge "Set clientId when parsing an explicit...

[automerger skipped] Merge "Set clientId when parsing an explicit DHCP_CLIENT_IDENTIFIER option." into rvc-dev am: f8de4fdc am: 6cdffb5e -s ours am: bd604c15 -s ours

am skip reason: Change-Id I9da5fec47a74de36869e795fa9b1d7170d2f91c9 with SHA-1 32bee5e7 is in history

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

Change-Id: I504c095dde2c50ca17565340c103221bc6e242ee