Merge "docs: Updating <uses-sdk> docs, bug fix: b/6836256" into jb-dev