Merge "Update javaDoc to make it consistent" am: 36d1da8f62 am: bb446b0c37 am: 994c0ba560 am: 2e96957b78

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

Change-Id: I461592a530a52f5e2bf8ea314bdf5e3ee9bb1fb3