Merge "MediaSession2: Workaround javadoc issue with hidden generic super class"