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

Merge "[automerger skipped] Merge "Set clientId when parsing an explicit DHCP_CLIENT_IDENTIFIER option." into rvc-dev am: f8de4fdc am: ee30356c am: e5a887e7 -s ours" into rvc-qpr-dev-plus-aosp am: bd38d0f6 -s ours

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

Change-Id: I5a80e9d52d3ef87678e3afffb5067c13b6a255d2