Merge "Don't call block checkpoint functions above dm-default-key" into...

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

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

Change-Id: I7106be7dfba2979ab24a210103ef6dba76bbe6e1