[automerger skipped] Merge "API changes as requested by API council." am: 359a8859 am: 521cb594 am: a1d8ab1a -s ours

am skip reason: skip tag Change-Id Ie465c49ff02065e78a2e8e211a13350a0ff7f0a4 with SHA-1 c89513ac is already in history

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

Change-Id: I0391b2b6d4e60a5b7642d4a20f79651da98560e4