Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f am: ec138734a7 am: 4c83d1509c

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

Change-Id: I4d6db2b92d56c3a75ec7a2964df236e9cbdc8f03
tree: 48d33f36fd4d705314ff8aba7ea78ea6e64eeeef
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS