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

* commit '74ce7413158607af6be2889d7392c2e904c9c210':
  docs: Update for Android 23.0.4