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

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

Change-Id: I9b8e6bb911c9f6b04b53ab76a28b404b30679f7e