Merge "Disable profcollectd for riscv64" am: d7132951b3 am: 780ae9fd78

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

Change-Id: I894cfc2143dcf729b621935824bfad959b61e08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>