Merge "Address API review feedback" am: 14a74d0c62 am: e9bee72082

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

Change-Id: I39de2c7701114faa0bf699a2fdb725a57188886a