Merge "Address API review feedback" am: 5e2a729668

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

Change-Id: I7a454e891edf3177bd87f041473f2749d3ee309f
tree: bafcbd4f2690f8f351ecd62d3b42e74b250de4f6
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING