Merge "Address API review feedback" am: 4123af09c9 am: 1dedf4a69d am: af72438c7d

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

Change-Id: Ibf64bbdad4b14d3b4b62d25bc1480a6dc403630e