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

Change-Id: Ica75d21ca628bafb77e23a056b7b498730b1f456