Merge "Allow traced to lazily start heapprofd." am: 4db9df1a92 am: d43f517327
am: 576e5f0097

Change-Id: Iff4be3df5adbedfc522c40716b2171fc49079c68