[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 -s ours am: 28f5e6ae -s ours am: 2f0258c0 -s ours am: 2a902d65 -s ours

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

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

Change-Id: I171a4d7dc2f10d5ba5bbf6e716923cbbfd63ed5d