[automerger skipped] Merge "API description changed." am: db051569 am:...

[automerger skipped] Merge "API description changed." am: db051569 am: 9f67e2a2 am: 12d4fc4d am: 0f71b888 -s ours

am skip reason: Merged-In I85cddad952cfb9f657b15c5c5e75bb0adc52188f with SHA-1 290fc6af is already in history

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

Change-Id: I15f8dee1c135c076513ee66369bc347322e09f48