Merge "Update docs and add nullability annotations" am: 9c0f722e2e

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

Change-Id: If9ce7912dc46b309591a37408968303eae5a46d0