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

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

Change-Id: I39de2c7701114faa0bf699a2fdb725a57188886a
tree: 52705435f8126c8c8b08b0484b7c5b7857647f50
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING