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

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

Change-Id: I2a3f0925c3335b744480a7fa723563d8bf0cfcb7