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

Change-Id: Ie622564ba02ec7a39d8f3574ea8885b225596c67