Merge "atrace: : add f2fs_iostat and f2fs_iostat_latency to disk category" am:...

Merge "atrace: : add f2fs_iostat and f2fs_iostat_latency to disk category" am: 4ad6e259 am: a80a0ce5 am: 0895360d

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



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