Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928

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

Change-Id: Ifa48af749baa5d50c7459dbb5bda1573d847b622