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

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

Change-Id: I9e857de9fd50435df21ffcce7074a7fcb959c98c