Merge "MediaTesting: Add ID3 Test" am: f25ccd9e4d am: ec89acc006

Change-Id: I481a245f0b278f5aa72149b1e923d879bee2ad5f