Merge "Add MediaMetadata equals to make metadata comparisons easier" am: 12bc5b6289 am: 171dec7468
am: 6ba5159291

Change-Id: I75138e80effdebee9ec699065360d3e5cc291775