Merge "Flush after every 2MB merge of replace ops." am: 8f7aaf9d am: 93340462 am: 0bf7f527

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



Change-Id: I0c57aa078d073ae73819b0545459bfa4481a2b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>