Merge "Disable Async merge. I/O failures seen on one specific device intermittently." am: 79aedde9b5

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

Change-Id: I30a39ca4b0785f71c7bd48ec954a9f53d4e6f71f