Merge "Fix potential crash when per-procstate cpu times tracking is turned on."
am: daddc5bb50

Change-Id: I8d4541aaf08b462b212b6530f2366d1dd5eaa147