Merge "Update droiddoc with combined generation of Java and Kotlin docs" am: ca31913b92 am: fccf7d8949 am: 24838df3f3
am: 35b5db56c9

Change-Id: Ie86761f97cb65d3a7fd435ad5c1f8866a0bd0688