Merge "Address leftover comments" am: 6e253df579

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2439670745ab19220e6cd44e6a62de5f61b842
tree: 833898a47359fbdd766c882af5ac4ae7579ca8f7
  1. core/
  2. services/
  3. tests/