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

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

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



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