Merge changes from topic "snapuserd-read-ahead" am: eebf447fef

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

Change-Id: I9d623ff7206acc32bec19974672a9f7204f32e16