Merge "Add test content provider to mock uri mime types" into udc-dev