Merge "Platform hook for ContentProvider Restrictions"