Merge "Make the deleteAllKey feature aware of the DSU mode" am: d718c8c577 am: 9c2577b823 am: fc8d1c7d37 am: 9c14e615a9 am: 01c95128fd

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

Change-Id: I87c84a9bfda2df0b2597842580775f27b8f0c03b