Merge "profcollectd: Refactor for better code clarity" am: 226b9a7fbf am: ae6ce90b86 am: dcbcf283df

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1922100

Change-Id: Ic1a4317d112b6745d40c0ebd63baffac2329aa15