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

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

am skip reason: Change-Id I5931a583e48ddac05f319629ae2f7f5f0f6cf032 with SHA-1 9aeae82f is in history

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

Change-Id: I85d17026510039d4d90cee8230aaf38855383bb2