[automerger skipped] Merge "Address API review feedback" am: 14a74d0c62 am: e9bee72082 am: d0b9b6a227 -s ours

am skip reason: skip tag Change-Id I5e8c4bed8bda40d507afa894c359b5e24ee5d868 with SHA-1 2e98f6cd57 is already in history

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

Change-Id: I859b0bd64ce3c38693e19209783bcdf91a562ef2
tree: 2bd7ab176a27164083c5b4e3e35c95f346950489
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING