Merge "Perfprofd: Modify perfprofd_config.proto"
am: db822be430

Change-Id: I2fa536f44e454477c75cc835410a3abbfc39ed29