[automerger skipped] Merge "Clean up MediaMetadataRetriever use"
am: 9c7e9034ab  -s ours

Change-Id: I47228bd8692fe343c8b86da583c48990d720a2d4