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

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

Change-Id: I1ad56b085541eae739b11b8941aa8569ec777554