Merge "Add the related extra information in the javadoc" am: f78aabbf82 am: db0c8c32b1 am: 7663d1760d

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

Change-Id: I9eb3c2543787a91f211be5eb7b92b66fe696489f
tree: f6c95e53d1e723c067e485136b1644951eb03e0f
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING