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

Change-Id: Ieda2bea70499c1b8b3e9d94fd3503192abcc322d