Merge "Add the related extra information in the javadoc" am: fccaf80eba am: e38830b5a1 am: c3286a8cc6

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

Change-Id: I9eb3c2543787a91f211be5eb7b92b66fe696489f
tree: be5b4a2b403e87e6fd14ccf6185d932a3cf32ad6
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING