[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 skip reason: Change-Id I45e45912f91e8d78891a8658f9f2e27c7e6252da with SHA-1 40702ff3 is in history
Change-Id: I55eee44298c57193b2d38a3f76c19e51c2ae7b72