Merge changes from topic "encryptinplace-cleanup" am: 91e4f1dd76

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

Change-Id: I50e47bd1cb102b9013542b0676258a79ac44b6b1