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

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

Change-Id: I8bab3f8f1a90ca4900cc4179b1a4e0177bdcbc84