Merge "Address comments on aosp/1612040." am: 0f6df3ba7d am: d0a19e01c1 am: 95340c3e69

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ede7d126fe6a610c9c4c4dc8c631270a599d3cb
tree: 9eea80ac157c47d59efa635268eb373003f79190
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS