API tweaks in response to feedback am: 5968c09340

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

Change-Id: Iddee215c5ea2e5b5cf3e751d6d995eada9e2d1ef