Merge "Revert "atrace: add ufshcd_command event and change block events for...

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2237180



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