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

Change-Id: Ie210bbb4a9231377b795ca86219dfab7ee59ff8c