Merge "Address API review feedback" am: 4123af09c9

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

Change-Id: I50c59c529bc3e8f5a817f64f3fb0f093228b027f