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

Change-Id: I8756a5b04b5f1c5a9e32dbb8626841b806dcde2b