Merge "Add bug numbers for TODOs in MediaRouter2 related classes" into rvc-dev am: 5c8f3b20d5

Original change: undetermined

Change-Id: I441f51b100a3b7aa5d17e9199ae0e9c122695d64