Merge "Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: 89f96e8fa4" into nyc-mr2-dev-plus-aosp