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 am: bd103835

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



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