Merge "MediaTesting: Add AndroidTest.xml for ID3 Test" am: 54bd7dd51b am: 2ce249330f am: fbf83d5105

Change-Id: Iabd960d422a4a12d87ec67207e938b46b617e12b