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

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



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