Merge "vold: Unmount StubVolume disks before unmounting EmulatedVolumes" into main