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