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

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



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