am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs

* commit 'b15cd5296675fac00e5517b89fc1263d59fbad65':
  docs: Update for Android 23.0.4