am 5c6912c6: Merge "Fix permission check on ContentProvider to be multi-user...
am 5c6912c6: Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev
* commit '5c6912c6':
Fix permission check on ContentProvider to be multi-user aware.