Merge "API changes as requested by API council." am: 359a8859aa am: 521cb5949f

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

Change-Id: I60b899f2e3f57bfce4856df131d7d9f07dad041c