Merge "MediaRouteChooserDialog: Fix IllegalStateException" into nyc-support-24.1-dev