Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928 am: 53f1d07339 am: ebc8801fb3

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

Change-Id: Iab701b88377b966aef876d9349dae42341ea0c83