Merge "set iostat_period_ms to 1 sec" am: eff9050c am: 69525ba3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2321866



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