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

* commit '7def60268519536083839a7fd0a2ddfd68d75504':
  Revert "docs: Update for Android 23.0.4"