Merge "remount: Split fstab and checkpointing code into helper functions." am:...

Merge "remount: Split fstab and checkpointing code into helper functions." am: 18d8cd76 am: 4d9d7034

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



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