Merge "Add test config to perfprofd_test" am: e0d790c82c
am: 53011202e2

Change-Id: I958abbc2add81e44bc1bde40beb47c18ef98e399