Merge "[automerger skipped] resolv: remove resolv_delete_private_dns_for_net am: 642a0bbe69 -s ours am: c52e06a9d4 -s ours
am: 91bae9a257 -s ours
am skip reason: change_id I340f60ef11415c9b83aa66884fffdfae3153d1d0 with SHA1 dec7190574 is in history

Change-Id: I9c0af721e2108a01d762d7147847a375583593ef