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

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

Change-Id: I9935a6a937d7e9cb953e68e34afa738598ed1ea5