Merge "Revert "Use context's userId in ContentResolver class.""