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