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

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



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