Merge "Add test config to bugreportz, dumpstate_test_fixture and surfaceFlinger_test"