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

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

Change-Id: I28615b8a9a656804b8ebacff0876e2acb1a64c1f