Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev