Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev