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

Change-Id: Ic83b4e37c060f340d5a001fc7b105cc2dc8fd10e