Merge "Return an empty cursor when a content provider app op is disabled"