Merge "Update the support lib MediaRouter dialogs" into lmp-mr1-dev