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 am: 292b3150 am: cb5d2e1a am: 8ab606ab am: 6a544212

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



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