Merge "App ops: turn off content provider ops when running under test." into jb-mr2-dev