Merge "Address API review feedback" am: 14a74d0c62

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

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