Merge "Remove calling UID check from ContentProvider" into sc-dev