Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2
am: c8458cb3b9
am: a398c99862
am: 0a23fdb546
Change-Id: I4dbfc4ce1c1bf3509cb61be444d7d97330d0a85a
This commit is contained in: