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

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

Change-Id: I4f13d5167bb237ad7ba4177f60dfc14fb3a8dbda