Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0 am: 4cd238b900 am: c36d0e23bb

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

Change-Id: I20509d10a0534c9c2a6795c73809f02461e03b67