Merge "[automerger skipped] Merge "Clean up MediaMetadataRetriever use" am: 9c7e9034ab  -s ours am: 906b37ec09  -s ours am: 0da4e3b6e8  -s ours am: d73f82a551  -s ours"