Merge "Remove StubVolume disks upon vold reset events" am: e8d0e486a3 am: 344c737ba0

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

Change-Id: I0c076a1a44b605585feeb5781ed87f755ebdcd68