Merge "Mark COLUMN_MEDIASTORE_URI as @TestApi."