Merge "fs_mgr: add readahead_size_kb in fstab" am: 748a701853 am: 0541141771

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

Change-Id: Ia862d6e53f1bf5ff9a682618b3d5eb134a55b3e7