API tweaks in response to feedback am: 5968c09340 am: 429a15d480

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

Change-Id: Id99748d0b831349929744ecd24c5ba1069054633