Merge "Address API review feedback" am: 5e2a729668 am: ce433429ab

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

Change-Id: I39de2c7701114faa0bf699a2fdb725a57188886a