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

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