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

am skip reason: Change-Id I7a772ff712dec9e69df175de840d69d296c65923 with SHA-1 2055364f is in history

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

Change-Id: Ia81f075ed0193fa64ff6e99611d6d3ae37d6090e