Merge "atrace: add ufshcd_command event and change block events for disk category" am: 09e7c8bfc6 am: 1b4d79e1a9 am: db7df5dc74

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

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