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

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

Change-Id: If04d1acf38089a649c3c8980c1d7d1b593267746