Merge "Address race condition in procstate time tracking" into sc-dev am: b1f548e3 am: ee0373e4 am: d730ccd8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177890

Change-Id: I7f58ed58f632d91883f52b16cb93951a5f487639