Merge "Progress towards splitting MediaProvider UID."