Replicate doc fixes internally

These fixes were made in the androidx repository and will be made
on the next import, but replicate them internally in the meantime
so that the baseline can be cleaned up.

Bug: 303477132
Test: m docs
Change-Id: I034b4721eb5d28113c44b8ad07ea3a15c14c175b
3 files changed