Merge "Unhide DocumentsContract.isTreeUri."