Merge "Update ContentProvider#checkUser access."