[automerger skipped] Merge "EncryptInPlace: ensure that backup superblocks get encrypted" into rvc-qpr-dev am: 9988536ecd -s ours am: 44a669176f -s ours

am skip reason: Change-Id Ic090bf4e88193b289b04c5254ddf661ef40b037e with SHA-1 4ac43f0e16 is in history

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

Change-Id: I6e3bf2f1a631ed92ee8e42357b83bbdfa3ba1587