[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 -s ours am: 78052b2d -s ours am: 7d82f8aa -s ours am: 46179119 -s ours

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

Change-Id: I55d9ffd548aedd054d2fbfe665efaa8a61e16e71