MediaRouter: Preserve custom data in metadata between Api21 and Compat

Bug: 25328581
Change-Id: Id7ef2dcecb5ee1e47deab59c0e96ca4cb451fa58
2 files changed