Merge "Fine tune blkio setting to improve boot time" into rvc-dev am: c39f708c am: 68a0069d

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

Change-Id: Id891d4b6eec538b5d4f1ea3d6faafef07d216613