Merge "MediaTesting: Add ID3 Test"
am: f25ccd9e4d

Change-Id: I79b7dec5c53fe4fb9aeb94343e0afaa6377e5e1f