Merge "New CTS tests for unstable content provider references." into jb-dev