Merge "Update documentation according API review" am: 2f85c69c74

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cb513413bf75ac73acc46c249c5e9d06456c65c