Merge "Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadc am: e0fd4c8a am: a111e0f7 am: eedb6955 am: 89f96e8f" into nyc-mr2-dev-plus-aosp