Merge "[automerger skipped] tests/resolv_gold_test - fix...

Merge "[automerger skipped] tests/resolv_gold_test - fix performance-unnecessary-value-param warning am: 5dc297fb -s ours am: c729e003 -s ours" into rvc-d1-dev-plus-aosp am: 5ad7b446 -s ours am: b4ce9fb7 -s ours

am skip reason: Change-Id I619b9664ffa5f3cd8a99cb0b36e13315383630ee with SHA-1 5dc297fb is in history

Change-Id: Ibd1a85e26fc1f7a6ffb61d6b1433a63083781eb7