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