Merge "API description changed." am: db0515696f am: 9f67e2a271

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

Change-Id: I169bf04d7430a7855110844acce83332f0aedd57