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

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

Change-Id: Id7c98018bdd935741c3f61b845e0353489edd28b