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

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

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