Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2
am: 5656d63f54
am: 30cb1ddee7
am: 35a9e8cad5
Change-Id: I5eae1dbba22c25c48c22477a75a15dc4912e037b
This commit is contained in: