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