[automerger skipped] Merge "Fix potential crash when per-procstate cpu times tracking is turned on." am: daddc5bb50 am: 38bbdb4de8
am: 0a356c724b -s ours
am skip reason: change_id Id014f23fbe31fed64fba769f14ba4396a003092e with SHA1 020239df85 is in history

Change-Id: Ib8ee2a363bb30043b89c98ff0292899f856d6a48