[automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 507d2190 am: 06d61488 -s ours am: dc685860 -s ours

am skip reason: Change-Id I7a772ff712dec9e69df175de840d69d296c65923 with SHA-1 39c7961c is in history

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

Change-Id: Ic14f5e82b0e22facd70c439f77cf45a2b5a4e063