am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs

* commit 'd36dbe09a18fc7226029e841cb2a856fb83c81f2':
  Revert "docs: Update for Android 23.0.4"