Bug: 31319086 Test: Checked the created javadoc with "make docs" Change-Id: I97c77ba4f00a95bc5eedf1dcee942aebd2d89ccb