[automerger skipped] Merge "remount: Do not allow remounting during...

[automerger skipped] Merge "remount: Do not allow remounting during checkpoints." into rvc-dev am: 20d78e33 am: 75eb7e69 -s ours

am skip reason: Change-Id I5931a583e48ddac05f319629ae2f7f5f0f6cf032 with SHA-1 8696a5d1 is in history

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

Change-Id: If94db245896a54888edfcb8c3fe4febad616ae41