am d0d209ed: Merge "App ops: turn off content provider ops when running under...
am d0d209ed: Merge "App ops: turn off content provider ops when running under test." into jb-mr2-dev
* commit 'd0d209ed':
App ops: turn off content provider ops when running under test.