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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc3da07dd593b63a10b45fccbe8731c16ef7183d