Merge "API description changed." am: db0515696f

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

Change-Id: I9b9266052d13d110337cdaeacd597fdf83d7a308