[automerger skipped] Merge "Add resolv_unit_test_config.xml for mts" into...

[automerger skipped] Merge "Add resolv_unit_test_config.xml for mts" into rvc-dev am: 6405f3e7 am: d5cad8da -s ours am: b08b58ac -s ours am: f978b7c3 -s ours

am skip reason: Change-Id Ib1e497398273413168d6103b5d2dce71872bc672 with SHA-1 c73fe83d is in history

Change-Id: Icf5cf887e2776f59d9ab1348a4aa1521342b3c13