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

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

Change-Id: I945518919facfb1aec58f297feaedef816062ecc