Merge "Move readdir decision-making to MediaProvider."