Merge "API review: Additional documentation & annotation" am: 04c1004ef4

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

Change-Id: I0087dae04f29f790dd31114f9486d7fcef7c99fb