Merge changes from topic "encryptinplace-cleanup" am: 91e4f1dd76 am: ee175c954a am: 992e8dfdaa am: 0b705b5167

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

Change-Id: Ifbcf5c10ab81955720e7c0209d9c59a2a54aae0a