Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1

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

Change-Id: I29e6eab9571d4556883594049f4abc33d9ffa674