Revert "MediaRouter: Preserve custom data in metadata between Api21 and Compat"

This reverts commit 56264c1f9d3493fc24728b37e20c11dc066385e7.

Bug: 25446896
Change-Id: Ie25586c5c44f87a080ae6dc1f87cc8e76a1e37d1
2 files changed