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

* commit '233697471689a41a36f69cc9bda1e663d2f67804':
  docs: Updating <uses-sdk> docs, bug fix: b/6836256