[automerger skipped] Merge "Fine tune blkio setting to improve boot time" into...

[automerger skipped] Merge "Fine tune blkio setting to improve boot time" into rvc-dev am: c39f708c am: 68a0069d am: e0b768a1 -s ours am: 5ce8ce85 -s ours

am skip reason: Change-Id I5262c28596adb7e849b202b8a163c190818f271a with SHA-1 11d167b5 is in history

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

Change-Id: I416df80ea9441af45a0a70e460a2ca4da77a338c