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: 6ce25f12

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



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