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

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

Change-Id: I6ea797209d4d4118ffd28acba4dd419f56d90536