Merge "profcollectd: Remove local files once disabled" am: dbb2c44f8b am: b0eaf30b3b

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

Change-Id: Ie88f846ce8286ca103421bf8405aedb63fc275f6