Merge "MediaRouter: Preserve custom data in metadata between Api21 and Compat" into mnc-ub-dev