Merge "MediaRouter2: Fix javadoc" into rvc-dev am: 82f3ed2925

Change-Id: I019aa28e7ca57b26a8b47274de6eed6cb3040a4c