tree 656c1179d649fe41672fcd65ed0e02e667ac653a
parent 61ffc1b096ed49a1755bafb857af236fabd0e822
parent ee175c954a25454969860ddf19bc884ed3022fd0
author Eric Biggers <ebiggers@google.com> 1604519591 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604519591 +0000

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