Merge "Fix some broken docs in android.media" into main