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

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

Change-Id: Ibb93e156fa54339776c31446942af62df13b128b