Merge "Delete code used to read content:// URIs from MediaPlayerService"