Merge "MediaRouter: Fix lint warnings" into nyc-support-25.1-dev
am: bc3aa7ad65

Change-Id: I05c11a7eaf6eed67b09285a850a74de83c2beb6d