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

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



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