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

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

Change-Id: I51a94ff5b1a67036e2db7f3a38213b72c1981829