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

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

Change-Id: Ia082e6d94288b38a168dc6f3a1139e8338688102