cm: Reenable auto perf activities

Change-Id: I98770244e8dfa8c069f96a8012d6709403a7d13e
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0