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

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

Change-Id: I136b90935619e68664d16be875c2bff1c8d09c85