Merge "Ensure MediaProvider Fuse is ready after Vold reset"