Merge "Update javadoc of MediaControllerCompat" into nyc-support-25.4-dev