Merge "Address race condition in procstate time tracking" into sc-dev am:...

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

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

Change-Id: I14aee56d18b15736e121c202c45158fb5006062e