Merge "Detailed ContentProvider permissions checks."