Merge "remount: If checkpoint is in progress, wait for it to complete" into...

Merge "remount: If checkpoint is in progress, wait for it to complete" into main am: a93795de am: 79e5c4f4

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



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