Merge "Throw IllegalArgumentException for getContentResolverForUserId" into sc-mainline-prod