Revert "atrace: add ufshcd_command event and change block events for disk category"

This reverts commit ef9f97d96b6705ad0841115881c1d381ad44fb3f.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/hub?filter=highFailureRate&tab=clusterView&clusterId=9252668308680495469

Bug: 249426876
Change-Id: If068c583bc3f7181a6e4cb18781650d034d035ae
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 5cd2dea..6fb9a4d 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -193,9 +193,8 @@
         { OPT,      "events/ext4/ext4_da_write_end/enable" },
         { OPT,      "events/ext4/ext4_sync_file_enter/enable" },
         { OPT,      "events/ext4/ext4_sync_file_exit/enable" },
-        { REQ,      "events/block/block_bio_queue/enable" },
-        { REQ,      "events/block/block_bio_complete/enable" },
-        { REQ,      "events/ufs/ufshcd_command/enable" },
+        { REQ,      "events/block/block_rq_issue/enable" },
+        { REQ,      "events/block/block_rq_complete/enable" },
     } },
     { "mmc",        "eMMC commands",    0, {
         { REQ,      "events/mmc/enable" },