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

This reverts commit ef9f97d9.

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