Merge "Remove hidden RemoteControlClient constant usages in MediaRouter"