Merge "Address leftover comments" am: 6e253df579 am: 3b29da5cf7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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