Merge "MediaRouter2: Fix javadoc" into rvc-dev am: 82f3ed29 am: 99598261 am: d3129630 am: f93518e4 Change-Id: I00a75f83976f9ba7e443e7064013c3d3a4051079