am 6778b81f: am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs

* commit '6778b81fce54882635e8e6235a052bd3af569360':
  docs: Update for Android 23.0.4