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: 09e7c8bf am: 1b4d79e1

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



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