Merge "set iostat_period_ms to 1 sec" am: eff9050ccf

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

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