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

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