Merge "Make the deleteAllKey feature aware of the DSU mode" am: d718c8c577 am: 9c2577b823

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

Change-Id: I5236ae0e54e9c95576f1b4b2ac58544d3a0468f0