Merge "Perfprofd: Add IsProfilingEnabled to Config" am: b1dead7b29
am: a361c91030

Change-Id: I3c35c0d3c455c817a01c1989f436b11d5a3f13e2