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

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

Change-Id: Iaab53ad343a38a3764344f6e5ace2f7e242c79c1