Merge "Add the related extra information in the javadoc" am: aaf353b24c am: 8000286ede

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465

Change-Id: Ia2c8d547ec240b828925a98bf2e43291ababebca