Merge "MediaRouter: Fix the unmatched color issue in MRCD" into nyc-support-24.1-dev
am: 1dab1b378b

Change-Id: Ice620f4180c838001a8da83172a813dcef9f586b