Merge "checkpoint: Fix metadata file contents bug" into main am: 7081c00d7b

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3529517

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