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 -s ours am: 0e4c06fb -s ours am: 3d600ac8 -s ours" into rvc-qpr-dev-plus-aosp am: f5ad3ec0 -s ours

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

Change-Id: I37e21c0faaea213878e1305d9b4427784447ebf4