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

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

Change-Id: I9eb3c2543787a91f211be5eb7b92b66fe696489f