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

Change-Id: Ic2a2758100f6e0f8bd4b161ab31b05581a8c43b2