[automerger skipped] storageproxyd: discard writes when checkpointing, if...

[automerger skipped] storageproxyd: discard writes when checkpointing, if necessary am: 98e7f427 am: 77b37c9f -s ours

am skip reason: Merged-In I0924084f7f0b20018cbb71f5153469c8a686e262 with SHA-1 98e7f427 is already in history

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

Change-Id: I4b28dff3845aa33ce86d2c01c889ddd41794e012