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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a0aa4be487da19ef08f07f2613a15addacd2cdd