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

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

Change-Id: Ia2c8d547ec240b828925a98bf2e43291ababebca
tree: 03aa7223a84cff5ce67efd015b0b4baae22ffb2b
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING