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

Change-Id: Ied8eeffc8c6801d77d67b294d39790155fa80789