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

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

Change-Id: Ic3f7333839a1aceffff621ec8f592b744778cdef