* commit 'c705549b': Revert "Update CTS tests as part of ContentProvider cleanup." Revert "Update CTS tests as part of CursorWindow ashmem changes."