Merge "UsageStats: use the correct calling user ID for instant apps check" into main