Merge "atrace: add ufshcd_command event and change block events for disk category" am: 260480a3e6 am: 9e0a24caf7 am: 2aed45f211 am: 6c496e0c62 am: f62fe25af2

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

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