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

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

Change-Id: If0f5196b66387b3a195b10c1b48d030f7bb8eb5a