Merge "Ensure MediaProvider Fuse is ready after Vold reset" into android12-tests-dev