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

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

Change-Id: Ie920b496cb2f98f149917fe7f1700accaf68b26e