Merge "Update CTS tests as part of ContentProvider cleanup. Bug: 5332296"