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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3ad9eb4cf16d37cddfaece70b4f72755fd4e3a2
tree: f0491d9978cbcd6cdf6c2059847a1ceef4379c92
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS