Merge "Merge "MediaRouter2: Fix javadoc" into rvc-dev am: 82f3ed29 am: 09690d0c" into rvc-d1-dev-plus-aosp