Merge "remount: Do not allow remounting during checkpoints." am: 16a93c528f

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

Change-Id: I7e5413aa8ccbba7976f8f4ae3d490647d44b7bb0