Merge "atrace: add ufshcd_command event and change block events for disk category" am: 260480a3

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



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