Merge "Fix the comments from aosp/1717479." am: 5955bb19cb am: 2d1ccbfd91

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

Change-Id: I5c8869f627eb8f65ab7193991da0796dd682e8d4
tree: 7dbc54f05979f09c6d8b95dfb56a44db78f3c5d2
  1. core/
  2. services/