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 am: 6c496e0c

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



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