Merge "atrace: only start trace when starting trace" into pi-dev am: 51e6abd610
am: 1991437edc

Change-Id: I122005cb82bc0c796f7ac96fabd399da00085f83