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

Change-Id: I784fc52414555fe0391e37d9a300bf2913487997