Merge "[automerger skipped] resolv: remove resolv_set_private_dns_for_net am: a3a7114282 -s ours am: a937617cf3 -s ours
am: 07b79a3134 -s ours
am skip reason: change_id I944aa87c903c985d47466549c1b64034bdcaedd2 with SHA1 a2051f9004 is in history

Change-Id: Id759d2bfc8eca2403cc10a00bba411ba711a5e72