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

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

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



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