Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df am: 3c9703d0a0

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

Change-Id: Ie03214b795767065fbbe3b8ba071c68b244a0078