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

Change-Id: I6aeea9da75c438b7b6998254ca75781c515e37e3