Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1 am: 5acfc3e8d5 am: d1a7e750e2 am: 891b367b0a

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

Change-Id: I5399da429b5177f129f0e907d50a5caed760aa31