Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df

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

Change-Id: I9e69b6817d8a3b34e053b86c9c33c3f7f466ec71