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

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



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