Merge "profcollectd: Clean up dead code" am: 4a9b548867 am: 02cd95b2f1 am: f331a4ab86

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

Change-Id: Ie751e6e47a6e3c6687eeefe2753c77e5d0124474