Merge "Add test config to perfprofd_test"
am: e0d790c82c

Change-Id: I3e4a8f2b22870bd7ed3ad473a4b7135ff1a2d3c1