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

* commit '285859b13728c5cfb6124c11212978f8f95cd9de':
  Revert "docs: Update for Android 23.0.4"