[automerger skipped] API tweaks in response to feedback am: 5968c093 am: 429a15d4 am: 5cff38cc am: c313e8a8 -s ours

am skip reason: Change-Id I7f810f909a8a61b422283c3bafcc97307e4d863b with SHA-1 221f804a is in history

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

Change-Id: Ib196c66a4e02477c03796ce7c76b0e7dffe7c775